Cleaned up a little.

Final.