Enhancement: do some little changes