Code cleanup: Add logs