code style changes per yangmeyer