Refactor
Final (hopefully) lambda fixes