Further, minor refactoring