Minor cleanup of hackz