Further code cleanup
Consistent spacing.