a spot of refactoring