removed else condition based on review comments