General clean up and added comments into playerClass and playerClassRewrite