updated comments, removed log messages