Minor: Code cleanup
Code cleanup + API docs
Update CHANGES