Fix whitespace
Fix comments
protected -> private