Refact/controller