#488 A little bit more refactoring