less refactor continues...