Refactored & reduced clutter