Cleaning and comments for public API