Updated some string formatting