refactor - move stuff to common