minor code refactorings