Feature/housekeeping