Updated .tkn and cleaned code