Some refactoring.
Some refactoring, etc.