Cleaned up the code, updated the Create scene