Add comments, remove logs