Solutions from minion tidied up