Cleanup

Should help JS engines JIT easier.