Code cleanup, no longer does full decode/encode, should give a performance boost.