Getting rid of string manipulation