Clean up changes based on review comments.