improving code style