Housekeeping

Refactoring