Issue #40: fixing checkstyle warnings