House cleaning, minor refactoring.