refactoring
needed for LAS2peer for smoother startup