More maintainable script