A few small fixes on stuff highlighted by checkstyle.
Released v1.
Merge branch 'release/v1.0.0' into develop