changed some string formating