SWEEP: Make private/internal fields readonly where possible, #661

SWEEP: Make private/internal fields readonly where possible, #661 #653