Cleaned up class