Small Refactor for integration of inline and extract
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup