Formatting
Added string caching