Improved extra_comment, changed function names