refactored comments in core api