Organized headers and names to fit wiki