Switched order of extends and uses in class declaration, cleanup