finished cleaning code, check if anything is broken.
Merge branch 'master' of https://github.com/ShoppingScout/ShoppingScout