Code cleanup and adding string resources