Improve systemd unit