Clean up code
Remove underscore from private fields.

From now on use this.field if necessary. Commit includes also changes to
make code analysis pass cleanly.