Refactoring/house keeping.