more codesmell removal, some messages are now more informative.