Tiny bit more 'clean-up' (more OCD than anything, really) and improve comments

Signed-off-by: Krogonos <bryan.mayer26@yahoo.com>