little changes with code style