#153. Removed underscores from protected vars and methods, minor changes.