Change private field names to follow standard code conventions
Separate data block write in a method