Mansi, SimiJ | #59 | Refactored code around data entry