Fix indenting, etc.

Fixes #1