Changes made to satisfy comments