Format script better