Clean code + rework javascript compilation