Formatting, readability, comments, etc.

- some things that were bugging me that I think can be agreed
upon as overall good
3 jobs for 38-facility-address in 1 minute and 22 seconds