Fix to variable declarations and general spacing.