cleaned up some string formatting