WIP
lint cleanup