Trivial: Code cleanup
Enhancement: Refined API documentation