Cleanup and notes
Modified to match filename changes.