Refactored for a cleaner look
Refactored for a cleaner look