Clean code -> removed some logs. Added some comments. Remove unused vars/functions