Cleaned up class files