Cleaned up the class