Remove all hardcoded strings, clean up and bullet-proof code