Rename and reorder members to be more clear. Move variables to local scopes. Minor code reorganization.