Improve status script