Source: Minor code improvements
9 files changed