Refactor, add marker styling.