finishParsingModuleDeclaration refactoring
major refactoring