Cleaning up and moving string out to strings.xml