Tidy up controller