Some style changes
Minor changes