Fixes and style conformance changes