Code cleanup, removed whitespace and fixed alignments