Improving code styling