Fix decoder point bug + Improve coding style