Removed public annotation
Removed var_ variable
Fix underscore on protected methods