It works!
A little cleanup.