Cleaned up create