removing coding style issues