Update #64 - Refactor some utility code to util classes