interim
fixed js code quality