Cleaned up enhancement logic