refactoring
fixed issues with --no-implicit-any