code polish & improvements
Merge branch 'master' of github.com:srikanthk16/anemoi