Simplify
Rename + cosmetic.