Addresses #315

Also a little bit of formatting.