Minor style stuff and change email