slight improvement in refactor WIP