cleanup
string rework
process declaration for class