Reorganize initialization