Make constructor for utility class private
Refactor arguments