Slight tweaks to trim