neatened up controller