Trim down a bit per feedback.