Make code style more or less consistent

Review after https://github.com/allending/Kiwi/pull/315