Get rid of Helper class and move methods where they belong to