Classes was edited to satisfy requirements of checkstyle