Code style improvements; script arguments are working now