Created association between user and shop.
Code cleanup