Refactoring + markers