code review fix: one variable declaration per line