Basic formatting and cleanup.