Refactored for the better style