Cleanup checkstyle warnings introduced in last patch