bit refacto on controller