Closes #11
Minor style improvements