Consolidate common functionality into util.py to make the code cleaner

[atorkmabrains]

As agreed with @proppy , we will consolidate common functionality into util.py to make the code cleaner