Cleanup
Cleanup
more Cleanup
Merge pull request #1 from myrddraall/master

update