Just a commit, some cleanup changes