Cleanup, added Todos and comments