Week 4 Cleanup

String replace, first half of first sweep on cleaning up and optimizing
headers.