tidying up as per checkstyle