popup refactor
whitespace
linting