Checkstyle warnings removed