exta optimization + typo fix