Various minor changes
Minor style change