more lwi changes...
reformat code and optimize imports