issie_edit fix
refactor code