Minor refactor of fields in compiler