Cleaned up a bit, removed TODO, some of the comments and such