clean up Store controller and view