#1 fixed checkstyle violations