Lint cleanup
Handle when data is undefined