rearrange for clarity
housekeeping