Some minor changes to the previous commit