Clean up rule logic
add todos