Fixed variable declaration formating