Tiny controller refacroring