removed some refactoring side effects