Merge pull request #4 from smarthi/master

Fix the imports and line Indents
Touch up some inspection results