Code clean up (trying to reduce memory footprint)
Version bump
Comment tweak