Cleaned up the primary class