Correctiona and more refactoring
Correctiona and more refactoring