Api polishing and documentation