Cleaned up classes a little