Convert more to moonscript