Refactoring & More logs & More message for the user