Convert spacing from 2 to 4 tabs. Also cleaned up whitespace