Added in-text user markers
Refactoring
Refactoring