Make scripts and comments generic