cleaned up string formatting