#86 A little bit of housekeeping