Improving coding style