- Some code refactoring.