Formatting and InputDateSeparate instantiation fixing