Spacing and code cleanup