Move translation saving to model
Simplify conditions