Clean up minor details