fix deprecations
improve assignment syntax