Main changes

fixing spacing and tab lengths to clean up the code