Improve startup script