Formatting and edits (fixes #1)