Removed whitespace and fixed some sections. Lots of refactors.