Make syntax better