A bit more edit on the startup code