CR fixes, documentation and formatter improvements