#409 - solved checkstyle problems after merge