Refactoring some parts
Merge branch 'master' of https://github.com/Fristi/bargains-collector