Tidied up code

Made a few changes to match the coding guidelines for Mixxx.