[IMP] Imprved code and done changes as per TDE's lint cleaning eventssss. :-/