First changes to Appraiser and cleanup