Simplify initialization flow