Little refactor controller