Code improvements
Merge pull request #1 from shankarcabus/master

Code improvements