small cleanup
ensure compilation order