Spacing
Various simplications based on actual script