Minor code refactoring changes