ENH : simplify stockwell code