Externalized strings; cleanup