* slight refactoring