Move mark methods next to marks
Simplify vega_mark with better mark structure
Re-roxygenise