Refactor Shops even more + Reformat everything