Fixed whitespace/format issues