Remove separate Selector classes
Formatting