design changes
Minor style changes