Cleaning up a controller no-no