Minor changes as per comments