General clean up. Pulled out some string values.