Modify input for easier parsing