Cleaned Whitespace

Added and removed whitespace where necessary. Also fixed indentation.