Minor changes to made