remove warning - unused String
refactor naming of variables