Fixed inconsistency and redunduncy.