reformat code
fix blocking JS