Refactored for a simplicity