Cleaned up classes a bit