Refactoring: use 'var' instead of full type name in declarations