Minor cleanup, comments, formatting.

Signed-off-by: robhol <email@robhol.net>