Small code fix and comment