Update Formatting

Keep formatting the same as upstream project :)