brief refactor 15/12/12