Merge pull request #1 from rumpelsepp/cleanup

Code cleanup