Fixed TODO: Moved misplaced util