more formatting and whitespace
7 files changed