Improving code syntax