Removed underscore as field prefix of non-static fields