Format cleanup

Format cleanup