Added uniform output structure
Ran with phpbeautifier.com