Cleanup / formatting.