some light organization and cleanup