Cleanup, comments, changed project name