Renamed stuff according to the review comments
Moved even more stuff to the utils class