moat formatting changes