Simplify edit fields to avoid repetition