#52 tidy up for controls