Moved a few things to the utils class. Better use of the constructed properties object