Fixed Name to better enable cleaner formatting
Made Formatting nicer to read