Some clean up, todos, and comments