Refactorings, typo correction.
Generalized sensor payload data for use with other sensor types in the future.