[#307] polishing shooter form