PR cleanup: spacing, default params