Improve use of TARGET
Improve internal var naming
WIP