Refactoring & More logs & More messages for the user & More security