Fix whitespace
Add enrichers
Cleanup