Cleaned up formatting
Classes