Removed unnecessary NULL_CODE and some minor make-up changes.