Fix recursive bug
Strings reorganization (80 chars)