Formatting and link cleanups