refactor. more ctrl-save