Refactor/house keeping.