2.1.6 Refactoring Complex Logic

Sorry but I am currently being built. I apologize for any inconvenience. In the meantime, here's a picture of a Platypus.