cleaning it up a bit on the solution side