- Removed duplicated code