Removed strcat dependency