markers structure improvement / refactoring