Cleaned up create choices to @sdehaans's nicer style