Small amount of code refactoring.