Added changes as recommended by @cbeer