Clean Coding ...
Updated