Changes based on feedback from xyzz (github)
Minor cleaning up