Commit Cleaning Up classes