Minor update
Minor style update and a bug fix