Adjusted files to clean things up.