rollcall votes + code refactoring