Small re-factor for clarity