Refactored Yoda into a cleaner(relatively speaking) Structure