2 markers and a code clean-up