Cleaner code
Merge branch 'master' of https://github.com/effique/goblin-market into newcss