Refactor private fields of models to public final fields