Week 4 Cleanup

100% Header/CPP standardization.