cleaned code, working on legislator listener