Cleaned up main and create