Spacing change for mac, clean up and formatting changes