Cleaned up excess. Trimmed the fat.