Improve code style (attempt 2)

See #18.