Refactoring of the tomar-prepare-inputdata application