Fixed errors pointed in review