Fixed typo
More improvements