Cleaned up the init script a bit