Some coding style improvements