Style update, some js linting