Tidy up field access