Formatting changes, rearranged properties