Removed rstrcat(), fixed some indentation.
No more rstrcat!