address coding style issues