OCD for readability

Final inspection of comments and codes for the day before calling it a
day…