Chore/update api calls

updated and cleaned up some code in StorageAPI.java and BQUtils.java