changed to meed coding style standards