Bit of organization and cleanup