Merge pull request #8 from samatha-kankipati/B-52097

B 52097
[B-52097]:  formatting the code and organizing the imports