map functions, aesthetics better