removed self-import (minor cleanup)
s/moved variable/moved value/