Cleaner formatting for tools and test cases