Marked fields accessed by reflection

These changes are already present in the Develop branch
Style clean up