Simplification
Fixes.