cleaned up comments and TODO