Some refactoring & clean up; removed legacy code; simplified api