Switched to a more regular formatting style