Changes after review by @nwhite89