fixes for checkstyle to pass