Automitize info gathering
Refactoring