Clean up comments and TODOs

Make is sexy