Looks like you added getter methods for most or all of these.  Make the fields private and force callers to use the getters, then?