Better class names
Removed extra new lines