many more code cleaning & js assets restructuring