Cleanup:Add correct text formating