Merge pull request #273 from stopfstedt/master

code cleanup.