refactored gun controller and template