Fixing keywords and removing files option