Merge pull request #177 from TheBlueMatt/2018-09-163-cleanups