Make vatinData accessible in VATINField as well, some cleanup

Not sure if this is the best name though... Thoughts?