Code cleanup, namespaced API functions/variable types. More cleanup probably to follow.