Cleaning up warnings and tidying strings