Fixed option and other field definitions formatting