person saving
some refactorings