added shell for siren decorator, some clean up