- Removed code duplication