Minor changes, style