Mended code style