Renamed all target variables to dot-notation.
Simplified setup_target, single call to function instead of two.