Refactor covert_entry method