A few adjustments and refactoring.