cleanup code
use lookupKeypath instead of get