Change typedef of struct to make it easier to be read