A more correct naming and better comments