layout and string cleanups