Fixing 'do' formatting from catching too much