Initial cleaning
Merge pull request #1 from slick666/master

ACK. Merged.