Refactored 2 methods