Coding style improvments