Fixed variable naming and spacing