Hide unnecessary vars
Fix comments