Small re-factoring.
Small re-factoring.