Code and string clean up.