CHANGE Tidy Up class to many files