A few more formating updates