Tiding up the code around the presets