added Helper class - refactoring