Simplified logic.
Refactored complex method.