Refactor constructor Lex