Minor formatting changes for COMPATIBILITY