This is slightly improved, but I'm a bit stumped on how to improve it further.