Update the header to be more logical. Style updates.