Fix the abbreviation recognition
Remove useless logging
It's really time I make unit tests
Make regex code a bit cleaner.