Make JSHint happy and remove the evil eval