Removed code duplication.
Added missing file to the file list.