added more information to result
code cleaning