Removal of extraneous commented code & added a few comments