reorganise things a bit