Moar tidying for HotSwa