Main refactor