Re-order methods
Remove targetBean property
Update logging