small corrections after refactoring