change to fit code style