Better and simpler deflexer