Cleanup and Update

Took out pretty indenting for sanity's sake