Code style fixes and minor Readme tweaks