Cleaned up the Create classes