Update gitignore file. Update code based on review comments