Minor refactoring to code.