Refactoring done
Removed console messages