Fix & cleanup unit file