Clean up format() and other long lines