lintidy
strengthen constructor