Minor refactoring to small portions of code.