Code cleanup + support for init= (systemd support)