Code cleanup

Code cleanup with extra functionalities added
Updated code so that users are notified for the update
Code cleanup

Code cleanup and enhancement !