some DRY clean ups