format and target function scope changes, etc... #139