Formatting/cleanup.