Cleaning decoding.cpp