Standardized spacing, reordered methods