Improvements to comments and added _ to protected funcs.