Fix lint errors are remove recusive data structure