Made state lemma more generic and simplified it