cleaned up strcat()s