minor changes to the code