Removed more comments, clean up