Refactor to simplify
Fix description