Clean choice (16/18)

Clean choice