Added doc strings
Minor style changes