Tidy Up Commit