Update Encoders

- Minor improments
- Updated simplified version