TrimForm improvements