Misc string cleanup

Very light cleanup and some sleep for a better flow.