Refactoring
Adding console