Less code, more yaml