Comments added to util classes