More classes
Removed commented code