Sort/remove usings, fix class variable access levels.