coding style improvements and updates