Code smell issues.. reduced obvious complexity
Merged code_smell and updated version