Moved more utilities out of body