Organizing Code

Reindent and Spacing