Some code cleanup

https://travis-ci.org/8tab/lmms/builds/17615694 - build is green