Code/whitespace cleanup.