minor changes before major refactor