WS
Change variable type
Remove unnecessary imports