Cleaned up the file and note table classes