Update exports
Clean up ands