very small changes (code refactoring)