Fix johnson simplex + coding style.