Some cleanup of code, added strings in xml.