Small re-factoring.