refactoring a bit before moving on