Cleanup repetive controller code a bit