small changes before switching branches to refactor