cleaned up trim