Improving code style