cleanup
format string fixes