updated comments, removed inline