Updated some declaration redundancies
Performance tuning in KeyEventCondition