Cleaned up the code and changed class names