A little bit cleaner startup code