Some cleanup of utils
Merge branch 'master' of https://github.com/mi3e/freeleague