renamed acronyms to uppercase some cleanup &refactoring
closed some TODOs
starting adding support for multiple APIs