Plans to simplify petrol storage legislation