Updates to make it compileable into a single JS file