Minor style changes.
Go best practises.