Fix spacing vs tab issues