Wrap some long lines
Use name based lookup