Fix issue #116 + other space/style fixes [ci skip
5 files changed