Add info
Refactoring main