Refactoring.
Fixed Encoder.h.