lil' refactoring