Improve use of systemd's states