Fixed formatting
Renamed classes for better understanding