cleaning up coding style