Refactor: Yeah, adding functional style code to that spaghetti code