Final foramtting changes