Clean up startup module a bit