Refactored the data parse