### Changed
- Improve readability in slashing import and remove duplicated code