some corretions on the latest refactoring