General clean up + Moving string to resources