nitpicking and small refactoring