Spacing and unused import cleanup
Fix warning on pom basedir
Refactor nested try blocks
Merge pull request #12 from Rise-Vision/chore/refactor-storageapi

Chore/refactor storageapi