Refactoring
Refactoring comments
temporary commit