Modified comments, removed auto NULL conversion