Some code clean-up.
Merge branch 'master' of github.com:lordmulder/LameXP