Better formating and smaller headers