p11: tidy
p6: solve with tests