Cleaning up our design starting with the header