[+FEATURE] some code cleaning and better reporting