tidying spacings - now using consistent variables