Cleaned up class from main