Minor fmt/order refactoring