Fix >80char lines, add SIGTERM handling, remove useless definition