Code cleanup

Fix typos, remove redundant semicolons, fix incorrect names
(using an m prefix where they should be using s, turn fields
with constant names into actual constants), etc.

Change-Id: I44a5ab82c1158007d0803d43ce14b361aff240b8
7 files changed