Some small tweaks, fixed newlines removed via 9422cda8a4439d2b3ff9f536f828bfdae1d78f72