Cleaner code (no semantic changes)