modified code style