Adds small changes after 2nd review