Cleanup
Clean up lambda macros