Few minor changes plus documentation (inline comment)