tidying and removing logging
Merge pull request #18 from mikedewar/master

tidying and removing logging