Rearranged and format matching

nothing exciting at all