clarified signature;
minor performance tuning;