Removed Util object, moved the methods inside it into appropiate objects