[+] Improved syntax and format via validator