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

did some code cleanup
Revert "did some code cleanup"
Merge pull request #2 from skazer/revert-1-code-cleanup

Revert "did some code cleanup"
Revert "Revert "did some code cleanup""
Merge pull request #3 from skazer/revert-2-revert-1-code-cleanup

Revert "Revert "did some code cleanup""