[WIP] JS Code Polishing