Adding comments and remove logs