Tidy up field-of-view processing