refactoring after code review. specs have been extended with touched?