Significant whitepsace and header style changes