renaming shop_now_controller to shop, and cleaning the code