Standardize conditionals

Simplify feature method and #enabled?