Several Refactorings: Simplified Encoder / Reduction of Naked Return Values