Lots of clean ups

5 months ago, Gary Kramlich