STYLE: Modified headers. Remove old comments.