refactorings...
slight moving around
should be better now!