Clean up

Vic,

I have done some esthetic changes. You can pull these changes into your project if you want.