Renamed and refactored method