Just some general suggestions for code cleanup

Data is already plural.