A solid improvement on my previous attempts, but I could always do a bit better