Revert "Small improvement on general.js"

This reverts commit 0e15465543c806b30a7ec88883cea5e768c86d97.
Small improvements on general.js