Added function parameters to variable definitions