Some minor formatting and cleanup.