tried to fix checkstyle and duplicated code warnings