Simplify initialization