Organized before script commands and fixed astyle