code formatting
unused classes deleted