Small change to simplify the code