Cleaned up the solution a bit.
Cleaned the solution a bit.