Formatting on all classes. Fixed import warnings