did some code cleanup
Merge pull request #1 from oliverlundquist/code-cleanup

did some code cleanup