Use another marker style
Add level 2 marker
Clean up unused code