A bit of cleanup
Merge branch 'master' of https://github.com/dkaste/lothbrok.git