Added and removed comments and loggings