Small re-factoring change