Second pass: Cleaned up, simplified. Removed excess features.