Code style enhancement - added var keyword where appropriate