[KFSQA-970] Changes from the code review. Outstanding item is how to deal with documenting the specifics of obtaining the etup data.