Code Cleanup. Switched to resources for text