Code reformatting

Resolves #35