code cleanup
Merge pull request #63 from manne/cleanup

code cleanup