Made changes as recommended by @miketheman on reviewing prior push