Improve init script

as requested