[CLEANUP] Data access check style clean up
Merge pull request #490 from scottyaslan/devBranch

[CLEANUP] Data access check style clean up