Made some more slight clean up as per hound comments