Tweaks 23 Aug 2013 draft
DRY - pick up name from functions
Trust undefined