Massive code cleanup

cpplint'ed everything that matters