Changed to conform to latest Checkstyle rules