minor refactor: remove some checkstyle warnings