Constructor code simplify