MInor syntax cleanup, splitting long lines