Whitespace housekeeping