Format my code

Remove some unnecessary classes