edited comments, modified to fit checkstyle