Lab1 util classes fixed