Formatting & code cleanup.