Fixing Some Mess on the Encoder Code

I'm starting to think your computer or X-Code is doing a number on all
these files....