Added feedback from @weaverryan with a little move around.