Minor differences between original code and current

In final inspections, noticed these changes from the original
that I wanted to fix before the final check in.