Code cleanup/modernization.
Added enabled property.