Removed logs, added comments