Little organizational changes, no code modified