trimmed a few things