[WIP] fixed lint issues