Line length and readability cleanups.