Refactor for div, exp and cleanup