Minor changes (removed an unnecessary event handler and two function calls that had no real influence).
