Changes made as per Wes comments