Fixed all formatting per style guide