Code refactoring
Code refactoring. Review Log calls (use personal class)