cleaning up comments and @TODO's