Cleaning up closure syntax