Trimmed the fat a bit