tidying up checkstyle issues