cleaned up coding style